NOJIRA: Merge umobile-trunk with rel-4-0-patches