Merge changes from topic 'theme_overlay_sysui' into oc-dr1-dev
am: b02863eba6

Change-Id: I81906c7fc634135f979316dd3c5d8d825bcf6c32