Merge "Update flicker app targetSDK" into main