[confluence] fix default focus in ProfileSettings.xml (fixes #15507)
Merge pull request #5591 from Montellese/confluence_15507

[confluence] fix default focus in ProfileSettings.xml (fixes #15507)
fixup 5f5d8c86490510f49b82d05ff16011bfbf4cbfa8; re-add default joystick map
Merge pull request #5600 from koying/fixdroidjoystick

fixup 5f5d8c86490510f49b82d05ff16011bfbf4cbfa8; re-add default joystick map
[android-5.0] fix playback getting progressively slower and memory filling up until crash

The timeout in dequeueOutputBuffer has been increased to 50ms (from 5ms), to ensure a buffer will be available. While it appears this is not an issue on 4.4 and older, on Android 5.0 dequeueOutputBuffer with a 5ms timeout will usually fail, releaseOutputBuffer will not be called, and this will lead to most dequeueInputBuffer calls failing as well (far fewer than wanted fps calls will succeed). This in turn leads to the m_demux queue quickly filling up with the raw frame data, consuming all system memory, until a crash results.
Merge branch 'master' of github.com:Chainfire/xbmc