Merge "Have wallpaper target itself when dismissing keyguard with wallpaper" into nyc-mr1-dev