Merge "Setting the display state to off when the default display is being changed" into tm-qpr-dev