Merge changes I2ac2cdba,I6ade7874

* changes:
  Fix crash when removing a display with activities
  Add positionChildAt method to WindowContainer