Merge "Fixing notifications side margins in large screen portrait" into tm-dev