Merge "Reset status bar in keyguard, fix MU status bar bug." into jb-mr1-dev