Merge "Add android:backupInForeground" into nyc-dev