Merge "Fixes typo in Intent extra names"