Merge "Ensure that force lock works with accessibility enabled" into lmp-dev