Merge "Fix KeyButtonDrawable dark intensity logic error" into pi-dev am: def169559c
am: 9eb59c53cb

Change-Id: I6b94436fe5637b0f56dc0b5b383e417896a3fc4e