Merge "FLAG_DISMISS_KEYGUARD should not hide status bar if secure." into jb-mr2-dev