Merge "Fixed a bug when resolving theme attributes" into mnc-dev