Merge "Disable Data Dormant/Active Indications while SCREEN_OFF" into mnc-dev