Merge "Protect UnlaunchableAppActivity against overlay attack" into tm-dev