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

Change-Id: I3458836ae5f0156c65706031d2c3743af1256258