Merge "Fix gravity after re-enabling expanded PiP" into tm-dev