Merge "Merge "Enable wallpaper zoom" into rvc-dev am: 8888ec91 am: de9eced0" into rvc-d1-dev-plus-aosp am: c4bb53da am: 7eb4f7e0 Change-Id: Iabec4b64038e429a4140901ed42b9f2cd46d8347