#10596 mobile bugfixes