Merge "Add overlayable file for SystemUI" into sc-dev