Merge "Move image cleanup operations to onStop" into sc-dev