Merge "QS tile lifecycle management" into nyc-dev
am: e59bbb0

* commit 'e59bbb0899e17710e9380b704141b100ddc2faa0':
  QS tile lifecycle management

Change-Id: I44eb2611b3c66c547c2f67c48278a01b0fb24652