Merge "Force top UI if we're expanded, per Jorim's suggestion." into rvc-dev