Merge "Add warning if an in-use Bitmap is reconfigured" into mnc-dev