Merge "Delay for showing progress dialog in permissionActivity" into sc-dev