Merge "Code simplification and movement to prepare for mActiveTracks"