Merge "Add isFilterBitmap() overrides where appropriate" into mnc-dev