Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5
am: 554b10a866
am: 6820c6e8f5
am: 2e680226fa
Change-Id: Idbc7dc61f22b268e1499b87538b96c18707b3ce3
This commit is contained in: