ANDROID LIFECYCLE REWORK: CLEANUP BEFORE MERGING “PART 1” OF THIS REWORK INTO DEV