Merge "Revert "Hide keyguard lock icon when QS user icon enabled"" into sc-dev