Merge "Remove workaround since compose navigation issue was fixed." into main