Merge "Tolerate "--dismiss-keyguard"" into main