Merge "Fixed a crash when changing density with HUN visible" into nyc-dev