Merge "Merge "Fix freeform window cannot move up" into rvc-dev am: 34e727ec am: a4920a6e" into rvc-d1-dev-plus-aosp