Merge changes Ia1ed53b6,Ic561e8b3

* changes:
  SF: Clean up input info calculations
  SF: Enforce that layers with invalid input bounds are not focusable