Merge "Make android:cantSaveState an optional feature." into pi-dev