Merge "Fixed that some notifications were expandable by just a few pixels" into pi-dev am: c5b780517e
am: 521ec6e677

Change-Id: I418271fad701c698bb79ba813749597d9a09b832