Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread