Merge "[DO NOT MERGE] Sync flicker from master to sc-v2" into sc-v2-dev