Merge "Temporarily use 1f bottomSheetDepth for multi-display" into tm-qpr-dev