Merge "Mark camera as closed before notifying listeners." into main