Merge "Remove odd screen ids when isTwoPanels is true" into udc-qpr-dev