Merge "Improve app op details layout." into cm-10.2