Merge "Add OnBringToForegroundTest" into mnc-dev