Merge "Use background drawable from the client" into nyc-dev