Merge "Fixing issues with alpha 0.0 on parent view." into pi-dev am: 1bcc95ef99
am: 532406eee3

Change-Id: I3b65b147e43fc199706379c163b110e225ad88c5