Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev