Merge "Make wallpapers direct-boot aware." into nyc-dev