Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5
am: 4a791935a6
am: 6c38423605
Change-Id: I6a4580c7c8c67f679d30195a9393dd48263c7f86
This commit is contained in: