Merge "Prevents embedded activity relaunched twice when display rotates" into main