Fix ng-style issue
Merge commit '674b5a5d86aaeeefa26b30c21d9431525e1d9596'