Merge "[1/n] Fix resize for activity embedding apps" into main