Merge "Add mModeSwitchingType to DisplayModeDirector"