Merge "DO NOT MERGE - Display mode switches." into mnc-dev