Merge "Debugging for issue #5180240: Wallpaper continues to consume CPU when screen off"