Merge "Remove disableBackgroundScheduling"