Merge "Return compat callback for apps requesting legacy back."