Merge "[DO NOT MERGE] Sort A11yService#getWindows by layer descending" into pi-dev