Merge "QCamera2: Avoids double free when flushing notifications"