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

* commit '4fef43dcf81d479d55bd642646c66e5153f73dcc':
  Fixed a bug when resolving theme attributes