Merge "Add missing computeOpacity call" into pi-dev
am: 3f5ab8bdf4

Change-Id: I7ba26906d57655421707d3d8734782c527de5e2e