Merge "Multi-user support for display density changes"