Merge changes Icda006de,I3590beeb into rvc-dev

* changes:
  SurfaceFlinger: treat the desiredRefreshRate of ExplicitDefault as max
  SurfaceFlinger: no touch boost for layer that explicitly voted