Merge "Remove partial support for hotspot changes on focus movement" into lmp-dev