Merge "Add back deprecated theme attribute and style" into mnc-ub-dev