Merge "Clean up ActivityView workaround for release"