Merge "Disable activities_on_secondary_displays on low ram"