Merge "Add non-system overlay flag for usb perm dialog" into sc-qpr1-dev