Merge "Fix dock intent lookup." into cm-10.2