Update to Foundation 5.4.7 + some Lollipop stuff