SystemUI fixes for merge taint

Change-Id: Idfc2432203c407d50e756df4ba463da3b726bcd4