Merge "Save reentry bounds from SysUI" into rvc-dev