Merge "Use themed context to inflate preference views" into mnc-ub-dev