Merge "[flexiglass] Don't clear pending keyguard dismiss action when..." into main