Merge "Fixed an issue where the top edge flickered" into sc-dev