Merge "Delay touching disks when secure keyguard showing."