Merge "Merging some Gingerbread status bar icons to master"