Merge "Updating isShowing during onResume()" into jb-mr1-lockscreen-dev