Merge "Fix AppIdleHostTest" into mnc-dev