Merge "[Folding to AOD] Do not delay keyguard show when folding"