Merge "ENABLE_TOUCH_OPAQUE_ACTIVITIES to default enabled"