Merge "Move taskbar clean up so that it only gets called when user swipes up to go home." into main