Merge "Introduced DO_NOT_ASK_CREDENTIALS_ON_BOOT flag"