Merge changes from topic "presubmit-am-14c0d0dd1ab9408c8fbd89013e2295b5" into tm-dev

* changes:
  Fix NPE when PiP actions, but no close action set
  Fix gravity issue when enabling expanded PiP (TV)
  Fix orientation change between PiPs when collapsed