Merge "Fix expanded Accessibility overlaps with Face Circle in Educational Screen" into tm-qpr-dev