Merge "Fix memory leak in FocusArea, FocusParkingView and ControlBar" into rvc-qpr-dev