Merge "Update Activity Embedding flicker test targetSDK" into main