Merge "Ensure that the layer of topActivity can reparent to rotation leash" into main