Merge "Rename *AppIdle to *AppInactive per api-council" into mnc-dev