Merge changes Ib7d3a07e,Ic22ccf17 into sc-dev

* changes:
  Disallow auto-enter PIP when there is an existing PIP
  Don't use icon home animator when entering PIP