Fix Galaxy S5 issues after Lollipop Update