Merge "Cancels dual display state when all activities for process are invisible" into udc-qpr-dev