Merge commit '376722fcdf41ade7286bcdb757564559d35a4976' into kraken * commit '376722fcdf41ade7286bcdb757564559d35a4976': Fix regression introduced when fixing focus issue with ScrollView.
Merge commit '376722fcdf41ade7286bcdb757564559d35a4976' into kraken * commit '376722fcdf41ade7286bcdb757564559d35a4976': Fix regression introduced when fixing focus issue with ScrollView.