Merge "Work around issue #65333586: Took phone out of pocket..." into oc-mr1-dev