Merge "Adjusting horizontal margin of notifications in split shade" into tm-dev