Merge "New tray notification icons, new system bar icons" into honeycomb