Merge "Update "Time spent in app" to "Screen time""