Merge "Avoiding heads-up when accessibility is turned on" into lmp-dev