am 2ddb4c85: Merge "Fix issue with site-specific display density getting stuck."

* commit '2ddb4c85093384f55d74a58a8bc0b7ebf6b6b265':
  Fix issue with site-specific display density getting stuck.