Merge "Use Device Policy dialog in switchbar"