Merge "Stop activity leaks" into ub-camera-glacier