Merge "Fix issue with site-specific display density getting stuck."