Merge "Make magnification ignore invisible wallpaper." into nyc-mr1-dev
am: 8051c9222e

Change-Id: I4d4338d71140773df82f89c4fa67dcf8ee004d4c