Merge "Merge "Fix foreground position during widget home animation" into sc-dev am: 3e366d6529 am: 5636db853d" into sc-v2-dev-plus-aosp