ShortCutBar support

PS2: Add back darker gradient

Change-Id: Ibcac1bf8c1810771f5a82395d434d0687406fb2e