Merge "App Standby : Association between content providers and their sync adapter" into mnc-dev