Merge "Size restrict right icon size in notification" into tm-dev