Merge "Add menu to show properties, add feature flag." into arc-apps
am: 87f1b2c273

Change-Id: Ic7b6c312bf4354e17e5964783a74595040599858