Merge "Workaround backgroundTinting not working on API 21" into mnc-ub-dev