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