Merge "DO NOT MERGE - Overlay display now support multiple modes." into mnc-dev