Merge \"Have wallpaper target itself when dismissing keyguard with wallpaper\" into nyc-mr1-dev
am: 5329715a74

Change-Id: I73abfacc9104437b73659991d21af3ef620e2211