Fixed style compatibility pre/post Lollipop