Merge "Fix matrix multiply in accessiblity display adjustments." into lmp-dev