Merge "Fix keyguard elements flash after tapping a widget which requires unlock" into main