Merge "Split control background into 40dp and 32dp diameter versions" into mnc-dev