Merge changes Id603816c,I86e41324,I025d0558,I44d8dbac,Iabfc2e81, ... into nyc-dev am: bb9fb194

am: 36211c08

* commit '36211c08':
  Only set mResizedWhileNotDragResizing for base windows.
  Fix Task dim with docked resize.
  Correct window replacement string comparison.
  Replace DimLayers with windows.
  Prevent premature window replacement.
  Correctly prevent entrance animation for replacing windows.
  Replace secondary app windows across activity relaunch.

Change-Id: I71b1d27ba2d42be9c12829931272abb743b99fc1