* commit 'a83f3c861444425092c60a3a51a9d25d05ab8ab8': Use bounds in screen for better A11y backwards compatibility