Merge "Maintain alignment of subtitle in mgmt screen" into rvc-dev