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

Change-Id: I93ca9adfd3960d8d063514c7092d65e87d9a80ff