orientation change bug fix
Merge pull request #119 from herbatnik/abcdTask

[Android] ABCD task layout fix
Merge remote-tracking branch 'upstream/android' into android