Merge "support expanding advanced settings from intent extra" into pi-dev
am: 0a45f54865

Change-Id: Ie01f91a1ddec0df35f149b8358e7078cf50bae56