Merge "Remove flag check for testCheckRemoteViewsUri" into main