Fix Carrier Logo from appearing at random when applying a theme

Change-Id: Icf0d819a1fd513124bc9c7ad7c5ebf69c9772b70
Merge "Fix Carrier Logo from appearing at random when applying a theme" into du44