Merge "DO NOT MERGE Validate wallpaper dimension while generating crop" into oc-dev