Merge "Update theme colors, fix EditText state transition" into lmp-preview-dev