Merge "Merge "Fix overlapping remote and recents animations" into qt-r1-dev am: b248a034 am: f76a0f83" into qt-qpr1-dev-plus-aosp