Merge "Prevents activity being stopped while folding/unfolding device" into udc-dev