Merge "Backport system default callback to Q"