Merge "Remove todo to Support sysUiStatusNavFlags" into main