Merge "Fix various problems with notification layouts" into lmp-dev