Merge "Merge transactions to parent if layer is going to be removed." into pi-dev am: c3a808d9cc
am: 611cb3ff6d

Change-Id: Id8e0b3415a64bd16beb011d63d9bdc984fb0db2e