Merge "Fix lockscreen Bug: 5391404"