Merge "DO NOT MERGE Enable debug in StatusBarService" into gingerbread