Apply required lollipop changes