Merge changes Iaad5b04d,Ic810dda6

* changes:
  Add null check before setting min size
  Remove assist capture on swipe up