Merge "Add app usage preferencee item into the history preference" into sc-dev