Merge "Fix lockscreen bugs with SHOW_WHEN_LOCKED"