Merge "Update custom shadow usage of ShadowActivityManager" into main