Merge "Merge "Run performInitialGrantsIfNecessaryAsync() on main thread." into qt-dev am: eb90b66c" into qt-dev-plus-aosp