Merge "Avoid falsing when the phone is unlocked." into sc-dev