Fix crashes during density changes

Bug: 27516933
Change-Id: Ibffa2f4d68c8c4aff09e74ee4dfb073d7d7bc8c5
2 files changed