Merge "Add developer setting to force hardware acceleration"