per app color fix

Change-Id: Ib5360af4db1d4e0bb62d677a90440de662989d42
Fix NPE

Change-Id: I281cd19338e7f0817725b73bdefb1dc616dec9b9