Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread