Merge "Fixes ApnEditor not restoring previous UI"