Merge "Update theme colors for better contrast and de-blueing" into lmp-dev