Merge "Fix launching activity from a pending intent" into jb-mr1-dev