Merge "Gets rid of the conditional keyguard dismissal in full screen user switcher."