Merge "for intent capture and pano, fix the redo/ok/cancel button sizes so touch ripples show up right." into ub-camera-glacier