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