Merge "Accessibility change when Trusted Face icon shows." into pi-dev