Merge "Removed the -p option since screenshots are now taken by Shell."