Merge "Update the tracking bug for init.environ.rc migration" into main