Merge "Add -i com.android.shell when --enable-rollback is specified." into qt-dev