Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev