Merge "DO NOT MERGE - CTS for display mode switches." into mnc-dev