Merge "Move all the permissions check up for unmount" into gingerbread