Merge "Add divider line below "see all apps" preference" into oc-dr1-dev