Merge "Prepare for flexible system bars" into rvc-dev