Merge "Fix bug #16712121 Add 'Experimental' substring to 'High contrast text'" into lmp-dev