Merge "Fix flickering in USB page" into sc-dev