Merge "Fix issue with lifecycle of Activities launched from Lockscreen" into lmp-dev