Merge "Merge "Setting the display state to off when the default display is being changed" into tm-qpr-dev am: 3284b2ae23" into tm-qpr-dev-plus-aosp