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

Change-Id: I0da7e3181e4ca1f9b470e22ab68dc3f7eedee6de