am 497a6259: No crash on color change and orientation change

* commit '497a6259757e4b61ef8f15aa516284d5b0ac3451':
  No crash on color change and orientation change