Merge "Fix KeyButtonDrawable dark intensity logic error" into pi-dev