Merge "Minor cleanup of left overs from GlowPadView integration."