Merge "Merge "Automatically switch to native density for ThemeHostTest" into pie-cts-dev am: 6acca735"