Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"