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