Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev