Merge commit 'a1d6c7d001cc4d2e53353be07127420c8907b6a3' * commit 'a1d6c7d001cc4d2e53353be07127420c8907b6a3': Fix bug with ScrollView so that text entry fields are not hidden by virtual keyboard.