Merge "Handle rotation (or refresh) before callback is received" into mnc-dev