Merge branch 'fix_samsung_j5_behavior' into 'master'

Fix behaviour of android j5 devices

See merge request !20
3 jobs for master in 2 minutes and 34 seconds
Status Job ID Name Coverage
  Build
passed #87958
build

00:01:24

passed #87959
release

00:01:26

 
  Test
passed #87960
unitTests

00:01:07