Merge "Ignore malformed shortcuts" into tm-dev