Merge "Prevent crashes when user is stopping" into oc-dev am: b4656dafc1
am: ada0568c76

Change-Id: I6f0c5a58d59c709d31345234056ad6eca0800b1e