Merge "Re-register listener for the switch upon onResume"