Merge "Changes following Allow background property to be set as a URL string" into...