Merge "Dismiss keyguard before starting edit activity" into main