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

Change-Id: I42ad7eb35ce3c8d5c82c901b0392d55186785759