Merge "Settings: reorder app security to top" into kk4.4