Merge "usb debugging: show alert to secondary user" into mnc-dev