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

Change-Id: I031c6948cb04e1fd25910070181615c6386cd90e