Merge "Ensure that windows are separated between the A11yDisplayProxy user and the a11y service user."