Merge "Revert "Call SurfaceControl.getBootDisplayModeSupport only one time"" into tm-dev