Merge "Remove controlBackground attribute, replace with direct reference" into mnc-dev