Merge "Keep volume row visible if dialog is showing" into main

                        || activeRow.stream == STREAM_ACCESSIBILITY

                        || mDynamic.get(activeRow.stream);

            }

            // Continue to display row if it is visible to user.

            if (row.view != null && mShowing) {

                return row.view.getVisibility() == VISIBLE;

            }

        }

        return false;