am ba4d9162: Merge "DO NOT MERGE - Allowing only a subset of display...
am ba4d9162: Merge "DO NOT MERGE - Allowing only a subset of display attributes to get overridden." into mnc-dev
* commit 'ba4d9162':
DO NOT MERGE - Allowing only a subset of display attributes to get overridden.