Merge commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5' * commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5': Finish off java API to allow fading scrollbars