Merge "Couple mResumedActivity to Activity lifecycle." into pi-dev