Merge commit '1e8c95318f0cce70dc66fb29036d084d5665abd8' * commit '1e8c95318f0cce70dc66fb29036d084d5665abd8': Show the live wallpaper on the lock screen.