am d88538a8: am 6246ade0: Merge "Remove controlBackground attribute, replace...
am d88538a8: am 6246ade0: Merge "Remove controlBackground attribute, replace with direct reference" into mnc-dev
* commit 'd88538a8':
Remove controlBackground attribute, replace with direct reference