Merge "Only update the compat system UI visibility if the source is valid" into tm-dev