Merge "Revert "Make Notification long clickable"" into tm-qpr-dev