Merge "Revert resize of the right notification icon" into tm-dev