Orientationchange fix + tap fix
Merge commit '0dcc7ba' into develop