Merge "DO NOT MERGE - Added a simple test for new attributes of Display." into mnc-dev