Merge "Reshow keyguard if keyguard going away anim is cancelled" into main