Merge "Added class arg to getParcelableExtra as it was deprecated"