Better support for Ice Cream Sandwitch + and adds support for setZOnTop Fix (Opt-In), as well as fuurther code optimizations