Merge "Revert "Add ActivityOption to remove keyguard when an activity i..."" into main