Merge "Improve tracking of screen on reasons." into mnc-dev