Merge "Only set FLAG_SHOW_WALLPAPER if we're currently animating unlocked." into tm-dev