Merge "Fixes landscape quickscrub track position of rtl layout" into pi-dev