Merge "Check time-spent-in-app intent must come from system app." into pi-dev