Add rest Lollipop changes
Thanks @Hashcode