Fix merge taint

Change-Id: I415beadf57414f579e9b6ae6297a7204f81ccc8c
Fix transparent background layout

Change-Id: Id1fc6b2cb7e5222c37984c5e3629b37846fe548d