Merge commit '70a37eac62e887d16c4964b805a612d41254ca7f' * commit '70a37eac62e887d16c4964b805a612d41254ca7f': fix some aspects of [2258746] native crash in launcher2
Merge commit '70a37eac62e887d16c4964b805a612d41254ca7f' * commit '70a37eac62e887d16c4964b805a612d41254ca7f': fix some aspects of [2258746] native crash in launcher2