Merge "Show dot on keyguard but not with QS expanded" into sc-dev