Merge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev