Merge "No need to notify SysUI of ERROR_USER_CANCELED"