Merge "Support for triggering the lockscreen while the screen is on:"