Merge changes from topic "heads-up-ambient-inflation"

* changes:
  Fix heads up views freeing too early.
  Inflate ambient + heads up view as necessary