Merge "Enable back button in keyguard security account mode." into jb-mr2-dev