Merge "Do not display adaptive auth string on dismissible keyguard" into main