0cfb877f5a
Also fixes a bug in GlowPadView that randomly popped up. Change-Id: Id20508a44ea02b4a14c8f794de36e13a2c06587c