am cf7f6b39: (-s ours) am 7daa8ff7: Merge "(Fork) MR1 Fix for crash in <select> drop down" into klp-dev

* commit 'cf7f6b39edcfe0ad3c22cfe4647c131a6e5be4ea':