am e67e9b7b: am 1a95a5c7: am 4fef43dc: Merge "Fixed a bug when resolving theme attributes" into mnc-dev

* commit 'e67e9b7bb01d56c990c25cea9205cf10c5e2731b':
  Fixed a bug when resolving theme attributes