Merge "Make SystemUI config extendable" into rvc-dev