fixed deadlock
Merge branch 'master' into ice-cream-sandwich
fixed text movement during bars showing/hiding