Merge "Allow activities to handle density configuration changes"