Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev