Merge "Update status bar icons to GM2"