Merge "Add check for playlist and subtitle in PermissionActivity" into tm-dev