Merge "Handle null case in AppStateAppOpsBridge"