Merge "Allow temporary locked OHM function disabled when keyguard visible" into sc-dev