Merge "Some refactor around default init location for picker." into arc-apps