Merge "Fixed a crash when changing density with HUN visible" into nyc-dev
am: 3af18ca

* commit '3af18caf8e31afe87ee82bb2710876bdcc1d9a06':
  Fixed a crash when changing density with HUN visible

Change-Id: I1d231c00a65ec911c6c04755caf1135da1c6feca