am 4a3c0918: Merge "Fix KeyStyles to be able to override the value in style"

* commit '4a3c0918dc3049e3e680a899f9c10b95e579368c':
  Fix KeyStyles to be able to override the value in style