Merge "Fix NPE in onFgsTimeout()." into main