Merge "Do not ring in theater mode." into cw-e-dev