Merge change 20351

* changes:
  make sure bootanimation will choose the right config wrt the native surface